Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 18 Apr 2010 23:14:41 +0000 (23:14 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 18 Apr 2010 23:14:41 +0000 (23:14 +0000)

Trivial merge